From: Ximin Luo Date: Thu, 24 Aug 2017 15:29:14 +0000 (+0200) Subject: guess-crate-copyright: use "MIT" instead of "Expat" or "MIT-License" X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~171 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=2ca2fd1bf6577479b574d6614491a3659b25f070;p=cargo.git guess-crate-copyright: use "MIT" instead of "Expat" or "MIT-License" Debian prefers "Expat" to "MIT" but we'll match debcargo(1) and the Rust ecosystem here --- diff --git a/debian/copyright b/debian/copyright index dabe22e32..794b97be8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,7 +12,7 @@ Files: src/* appveyor.yml configure Copyright: 2014 The Rust Project Developers -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: please do not add * to the above paragraph, so we can use lintian to help us update this file properly @@ -44,7 +44,7 @@ Files: vendor/bitflags-* vendor/tempdir-0* vendor/term-0* Copyright: 2014-2016 The Rust Project Developers -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: This is a collection of external crates embedded here to bootstrap cargo. Most of them come from the original upstream Rust project, thus share the @@ -71,7 +71,7 @@ Files: vendor/backtrace-0* vendor/toml-0* Copyright: 2014-2017 Alex Crichton 2014-2017 The Rust Project Developers -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/alexcrichton/ Files: vendor/aho-corasick-* @@ -79,7 +79,7 @@ Files: vendor/aho-corasick-* vendor/memchr-* vendor/utf8-ranges-* Copyright: 2015 Andrew Gallant -License: MIT-License or Unlicense +License: MIT or Unlicense Comment: see upstream projects, * https://github.com/docopt/docopt.rs * https://github.com/BurntSushi/aho-corasick @@ -96,21 +96,21 @@ Files: vendor/advapi32-sys-* vendor/ws2_32-sys-* Copyright: 2014-2017 Peter Atashian 2014-2017 winapi-rs developers -License: MIT-License +License: MIT Comment: see https://github.com/retep998/winapi-rs Files: vendor/curl-0* vendor/curl-sys-0* Copyright: 2014-2016 Carl Lerche 2014-2016 Alex Crichton -License: MIT-License +License: MIT Comment: see https://github.com/sfackler/rust-openssl Files: vendor/dtoa-0* vendor/itoa-0* vendor/quote-0* Copyright: 2016-2017 David Tolnay -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/dtolnay Files: vendor/error-chain-0* @@ -118,12 +118,12 @@ Copyright: 2016 Brian Anderson , 2016 Paul Colomiets , 2016 Colin Kiegel , 2016 Yamakaky -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/brson/error-chain Files: vendor/foreign-types-0* Copyright: 2017-2017 Steven Fackler -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/sfackler/foreign-types Files: vendor/hamcrest-0* @@ -140,13 +140,13 @@ Copyright: 2014-2016 Carl Lerche 2014-2016 Urban Hafner 2014-2016 Valerii Hiora 2014-2016 Yehuda Katz -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Files: vendor/idna-0* Copyright: 2013 Simon Sapin 2013-2014 Valentin Gosu 1991-2015 Unicode, Inc -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Files: vendor/idna-0.1.0/src/IdnaMappingTable.txt vendor/idna-0.1.0/tests/IdnaTest.txt @@ -190,17 +190,17 @@ Comment: see http://www.unicode.org/copyright.html Files: vendor/lazy_static-0* Copyright: 2014-2016 Marvin Löbel -License: MIT-License +License: MIT Comment: see https://github.com/rust-lang-nursery/lazy-static.rs Files: vendor/matches-* Copyright: 2015 Simon Sapin -License: MIT-License +License: MIT Comment: see https://github.com/SimonSapin/rust-std-candidates Files: vendor/metadeps-1.* Copyright: 2016 Josh Triplett -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/joshtriplett/metadeps Files: vendor/miniz-sys-*/miniz.c @@ -209,7 +209,7 @@ License: Unlicense Files: vendor/num_cpus-* Copyright: 2015 Sean McArthur -License: MIT-License +License: MIT Comment: see https://github.com/seanmonstar/num_cpus Files: vendor/openssl-* @@ -221,7 +221,7 @@ License: Apache-2.0 Files: vendor/openssl-sys-* Copyright: 2015 Steven Fackler 2015 Alex Crichton -License: MIT-License +License: MIT Comment: see https://github.com/sfackler/rust-openssl Files: vendor/serde-1.* @@ -231,19 +231,19 @@ Files: vendor/serde-1.* vendor/serde_json-1.* Copyright: 2014-2017 Erick Tryzelaar 2014-2017 David Tolnay -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/serde-rs see https://github.com/dtolnay/serde-ignored Files: vendor/strsim-* Copyright: 2015 Danny Guo -License: MIT-License +License: MIT Comment: see https://github.com/dguo/strsim-rs Files: vendor/syn-0* vendor/synom-0* Copyright: 2016-2017 David Tolnay -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/dtolnay/syn Files: vendor/thread-id-2.* @@ -255,51 +255,51 @@ Comment: see https://github.com/ruud-v-a/thread-id Files: vendor/thread_local-0* Copyright: 2016 Amanieu d'Antras -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/Amanieu/thread_local-rs Files: vendor/unicode-bidi-* Copyright: 2015 The Servo Project Developers -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/servo/unicode-bidi Files: vendor/unicode-normalization-* Copyright: 2016 kwantam -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/unicode-rs/unicode-normalization Files: vendor/unicode-xid-0* Copyright: 2015-2017 erick.tryzelaar 2015-2017 kwantam -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/unicode-rs/unicode-xid Files: vendor/unreachable-0* vendor/void-1.* Copyright: 2015-2017 Jonathan Reem -License: MIT-License +License: MIT Comment: see https://github.com/reem/ Files: vendor/url-1.* Copyright: 2015-2016 Simon Sapin 2013-2016 The rust-url developers -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/servo/rust-url Files: vendor/vcpkg-0* Copyright: 2017-2017 Jim McGrath -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Comment: see https://github.com/mcgoo/vcpkg-rs Files: src/doc/javascripts/prism.js debian/missing-sources/prism.js Copyright: 2015 Lea Verou -License: MIT-License +License: MIT Files: debian/* Copyright: 2017 Ximin Luo 2015-2016 Luca Bruno -License: MIT-License or Apache-2.0 +License: MIT or Apache-2.0 Files: debian/bootstrap.py Copyright: 2015 David Huseby @@ -328,7 +328,7 @@ License: BSD-2-clause ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: MIT-License +License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/debian/scripts/guess-crate-copyright b/debian/scripts/guess-crate-copyright index de0359340..8d80e2cde 100755 --- a/debian/scripts/guess-crate-copyright +++ b/debian/scripts/guess-crate-copyright @@ -1,6 +1,6 @@ #!/usr/bin/python3 # Copyright: 2015-2017 The Debian Project -# License: MIT-License or Apache-2.0 +# License: MIT or Apache-2.0 # # Guess the copyright of a cargo crate by looking at its git history. @@ -37,6 +37,6 @@ Comment: see {3} """.format( os.path.join(crate, "*"), "\n ".join("%s-%s %s" % (first_year, last_year, a.replace(" <>", "")) for a in data ["package"]["authors"]), - data["package"].get("license", "???").replace("/", " or ").replace("MIT", "Expat"), + data["package"].get("license", "???").replace("/", " or "), repo or "???" )) diff --git a/debian/scripts/prune-checksums b/debian/scripts/prune-checksums index e930cdc02..0c895cff4 100755 --- a/debian/scripts/prune-checksums +++ b/debian/scripts/prune-checksums @@ -1,6 +1,6 @@ #!/usr/bin/python3 # Copyright: 2015-2017 The Debian Project -# License: MIT-License or Apache-2.0 +# License: MIT or Apache-2.0 # # Helper to remove removed-files from .cargo-checksum # TODO: rewrite to perl and add to dh-cargo, maybe?